[automerger skipped] Merge "Revert "lynx(nfc): Modify NFC overlays for NFC apex"" into main am: fe8604e7e8 am: 871731dc49 -s ours am: 381602ef91 -s ours

am skip reason: Merged-In Icd19426cf13ab0b1092de4dc1abf79b850d04f3f with SHA-1 7cbe17540a is already in history

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

Change-Id: Ie6615685b76afb33709076a7386e0dd10273c385
Signed-off-by: Automerger Merge Worker <[email protected]>