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

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

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