[automerger skipped] Merge "Revert "lynx(nfc): Modify NFC overlays for NFC apex"" into main am: fe8604e7e8 am: fed9aa059d am: 00e0f6e9de -s ours

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

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

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