[automerger skipped] Merge "Revert^2 "lynx(nfc): Modify NFC overlays for NFC apex"" into main am: aadca75653 am: 8e993b8f68 am: 2dcb9f8e04 -s ours

am skip reason: Merged-In I8078db2061a83f4ebac2e46c1cec96e3c363b225 with SHA-1 1d9b0c8f26 is already in history

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

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