[automerger skipped] Merge "Revert^2 "felix(nfc): Modify NFC overlays for NFC apex"" into main am: 23daae5cb5 am: 6b6955ca71 am: 0d6c4c192f -s ours

am skip reason: Merged-In I56beefccd8cd5f5d12f6b867a31af60314826242 with SHA-1 7777a61a89 is already in history

Original change: https://android-review.googlesource.com/c/device/google/felix/+/2863471

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