Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: f7b6db1592 am: 8a129cddad

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2818125

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