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 <android-build-automerger-merge-worker@system.gserviceaccount.com>