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

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

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