[automerger skipped] Merge "Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"" into main am: bf8ffb2c68 am: c70cb81a1a am: 189134cc84 -s ours

am skip reason: Merged-In I443bcf2681437ec4a0caa3fdb5046ab856db0ddb with SHA-1 13426a9d37 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863495

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