[automerger skipped] Merge "Revert^2 "sunfish: Replace NFC app with NFC apex"" into main am: 8245ab63b5 am: 23d9fcf9b3 am: 1813a58584 -s ours

am skip reason: Merged-In Ib899388df166a2178d0e7c361c945122d5a82841 with SHA-1 1ec0335ffd is already in history

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

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