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

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

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