[automerger skipped] Merge "Revert "raviole(nfc): Modify NFC overlays for NFC apex"" into main am: f3e7300c21 am: d75de74bcb -s ours am: eb2833b193 -s ours

am skip reason: Merged-In I2716c95474b35fff59726c1cb9a54e5ea42f941e with SHA-1 d749a472a0 is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2818129

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