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

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863495

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