[automerger skipped] Merge "Revert^2 "redbull: Replace NFC app with NFC apex"" into main am: 09b4d2c8eb am: e201ee2955 am: 0f7d7ef1f7 -s ours

am skip reason: Merged-In I2e24114c31f8f67056b354a53c5a99ffa8218b63 with SHA-1 e302ff9b50 is already in history

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

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