[automerger skipped] Merge "Revert "bramble(nfc): Modify NFC overlays for NFC apex"" into main am: 0dd46deb14 am: 5550ab7cef am: 0be698ccd8 -s ours

am skip reason: Merged-In I12d48913d0334f6eb76061277274c80677ee3324 with SHA-1 a051507e0a is already in history

Original change: https://android-review.googlesource.com/c/device/google/bramble/+/2818126

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