Merge "Revert^2 "lynx: Replace NFC app with NFC apex"" into main am: b0ce4242e1 am: 22ea4bbc32

Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2863447

Change-Id: I4d4da02ac2aeb08cac14abe7b5a28b984b370af0
Signed-off-by: Automerger Merge Worker <[email protected]>

device-lynx.mk

@@ -78,7 +78,7 @@ PRODUCT_COPY_FILES += \
     device/google/lynx/nfc/libnfc-nci-lynx.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
 	android.hardware.nfc-service.st