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

am skip reason: Merged-In I501223148423092d756963129ece21242cab01e2 with SHA-1 6083070f52 is already in history

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

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