[automerger skipped] Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e am: 35abd35c39 am: b1644a944c am: 82bdbb3751 am: 76a30c7050 -s ours

am skip reason: Merged-In Ief6317a97f4c0208e506afc17ed6ab37e81d2db1 with SHA-1 168fe64455 is already in history

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

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