Merge "lynx: Replace NFC app with NFC apex" into main am: 86e259c1c0 am: e22afc3211

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

Change-Id: Ic06d1207cbb9554a0cef163bbb02d7b33533f911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 \
+	com.android.nfcservices \
 	Tag \
 	android.hardware.nfc-service.st