Merge "Revert "handheld_system: Replace NFC app with NFC apex"" into main am: 7705138a

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



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