[automerger skipped] Merge "handheld_system: Replace NFC app with NFC apex"...

[automerger skipped] Merge "handheld_system: Replace NFC app with NFC apex" into main am: 948aae4d am: 03a0187b am: 9be63f84 am: 2de1e084 am: 23fbc237 -s ours

am skip reason: Merged-In Id451b2de566bfba73d89b95b33a99cefbdb4ea6f with SHA-1 3e88b3a8 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2779728



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