[automerger skipped] Merge "Revert^2 "bluejay: Replace NFC app with NFC apex"" into main am: 9ed8f1c838
am: 6f1ec246bf
am: 692cf25016
-s ours
am skip reason: Merged-In Ibc741f24cc6d19adda3097d17bc81baf455f71d3 with SHA-1 35de536662
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863545
Change-Id: I891d0234ae0e30c13fbdd0ee73398317a8f29ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
1e6c17c489