Merge "Revert^2 "barbet(nfc): Modify NFC overlays for NFC apex"" into main am: 0222c2951b am: ecfe932981

Original change: https://android-review.googlesource.com/c/device/google/barbet/+/2863525

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