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

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

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