[automerger skipped] Merge "Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: c9084eb711 am: 2585699ae7 am: fb7c067a8b -s ours

am skip reason: Merged-In Ic565eeda1ec928e59be8a3a2c406ab799ef879a0 with SHA-1 0bb31c7af7 is already in history

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

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