Merge "Revert^2 "felix: Replace NFC app with NFC apex"" into main am: f9a52d87c5

Original change: https://android-review.googlesource.com/c/device/google/felix/+/2863566

Change-Id: I5e83b610bcba6efca110e5248febe30b65632fa9
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/device-felix.mk b/device-felix.mk
index 634b381..e7d2e12 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -97,7 +97,7 @@
 	device/google/felix/nfc/libnfc-nci-felix.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
 	android.hardware.nfc-service.st \
 	NfcOverlayFelix