[automerger skipped] Merge "redbull: Replace NFC app with NFC apex" into main am: d547e0f06a am: e7bdc0596f am: 96e86cc8dd am: dbabd3072f am: 9d13504a96 -s ours

am skip reason: Merged-In Icaf4f6809d262439b171aa75a23972fc6ec7a61b with SHA-1 1b16559dc3 is already in history

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

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