Merge "Revert^2 "lynx(nfc): Modify NFC overlays for NFC apex"" into main am: aadca75653 am: 8e993b8f68

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

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