Merge "Revert^2 "lynx: Replace NFC app with NFC apex"" into main am: b0ce4242e1
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2863447
Change-Id: I50b43c996fd362a8b5bc20ecfb61059105f8ff4f
Signed-off-by: Automerger Merge Worker <[email protected]>