Merge "Revert "bramble(nfc): Modify NFC overlays for NFC apex"" into main am: 0dd46deb14 am: 5550ab7cef

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

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