Merge "Revert^2 "felix(nfc): Modify NFC overlays for NFC apex"" into main am: 23daae5cb5 am: 6b6955ca71

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

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