[automerger skipped] Merge "Revert "barbet(nfc): Modify NFC overlays for NFC apex"" into main am: 9824dc0fc5 am: acb24bb567 -s ours

am skip reason: Merged-In I501223148423092d756963129ece21242cab01e2 with SHA-1 6521b1daeb is already in history

Original change: https://android-review.googlesource.com/c/device/google/barbet/+/2818133

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