[automerger skipped] Merge "lynx: Replace NFC app with NFC apex" into main am: 86e259c1c0 am: e22afc3211 am: 399ffed584 am: efb33b30b4 am: 8b5cbe97a1 -s ours

am skip reason: Merged-In Id85d62a10589765dffa293770bca9d0906eb2973 with SHA-1 be320b794b is already in history

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

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