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

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

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