[automerger skipped] Revert^2 "pantah: Replace NFC app with NFC apex" am: 61abf7319e am: 704a52bfb4 am: b23abea540 -s ours

am skip reason: Merged-In I4da74311505445715132b84afb557ec7e126abac with SHA-1 aa3c94e272 is already in history

Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2864190

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