[automerger skipped] Merge "Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"" into main am: 13abc9695d am: 7801f47575 am: f818552201 -s ours am skip reason: Merged-In I9028f8eae1d973d0f9b7553a6adf9525b56766c9 with SHA-1 34acb968a5 is already in history Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863088 Change-Id: Id2dedc0d627b894f103c818d12f74a429252fe0a Signed-off-by: Automerger Merge Worker <[email protected]>