Merge "Revert^2 "redbull: Replace NFC app with NFC apex"" into main am: 09b4d2c8eb

Original change: https://android-review.googlesource.com/c/device/google/redbull/+/2863086

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