Merge "Revert^2 "sunfish: Replace NFC app with NFC apex"" into main am: 8245ab63b5

Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863587

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