[automerger skipped] Revert "lynx: Replace NFC app with NFC apex" am: 8562f5b786 am: 42136d32a0 am: 51583737a9 -s ours

am skip reason: Merged-In If440c4bcad742af7c6d597eac9e45ce4d56453a4 with SHA-1 b1df779431 is already in history

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

Change-Id: I20734f7c210154949eadd8d3bcdf0ebaa71f6450
Signed-off-by: Automerger Merge Worker <[email protected]>