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

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

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