[automerger skipped] Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: f7b6db1592 am: 8a129cddad am: 666986445d -s ours

am skip reason: Merged-In Icb67edebd8c0579cd015fe8a8956ae45426002ae with SHA-1 3c2aa5f3a2 is already in history

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

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