Merge "Revert^2 "bluejay: Replace NFC app with NFC apex"" into main am: 9ed8f1c838 am: 6f1ec246bf

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

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