Merge "Revert "barbet(nfc): Modify NFC overlays for NFC apex"" into main am: 9824dc0fc5

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

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