Switch NFC from HIDL to AIDL

Bug: 216290344
Test: atest NfcNciInstrumentationTests
Test: atest VtsAidlHalNfcTargetTest
Merged-In: Id3f65723c6240bbae6f6cc92e7ee57e07e1f0974
Change-Id: Id3f65723c6240bbae6f6cc92e7ee57e07e1f0974

device-lynx.mk

@@ -59,7 +59,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc@1.2-service.st
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -73,7 +73,6 @@ PRODUCT_COPY_FILES += \
 	device/google/lynx/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
 
 DEVICE_MANIFEST_FILE += \
-	device/google/lynx/nfc/manifest_nfc.xml \
 	device/google/lynx/nfc/manifest_se.xml
 
 # Thermal Config