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

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

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