[automerger skipped] Merge "Revert^2 "lynx: Replace NFC app with NFC apex"" into main am: b0ce4242e1 am: 22ea4bbc32 am: 9c5eb74219 -s ours

am skip reason: Merged-In I9ae126ca8228c293bb7a88bed645528db3e0642b with SHA-1 ecb5502fcd is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2863447

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