[automerger skipped] Merge "Revert^2 "bramble(nfc): Modify NFC overlays for NFC apex"" into main am: a1c82b7c3d am: 42dbcfa203 am: 156f800838 -s ours

am skip reason: Merged-In Idfacfa312a7c19a5472301cc0cae4b2276ce28df with SHA-1 856c3d6d4d is already in history

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

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