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

[automerger skipped] Merge "Revert "handheld_system: Replace NFC app with NFC apex"" into main am: 7705138a am: 0af51caa am: 614ac8f5 -s ours

am skip reason: Merged-In Ic35189ae47f3e2b4302d09cbb524f7c8e6ddc2d6 with SHA-1 51dc3e7a is already in history

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



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