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

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

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