Merge "Revert^2 "bramble(nfc): Modify NFC overlays for NFC apex"" into main am: a1c82b7c3d

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

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