Merge "sunfish: Replace NFC app with NFC apex" into main am: a3c8cd657e am: 190d9be9c6 am: b73fc3360d am: be9f4c4dfd
Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2779847 Change-Id: I49c2435679ee798db88a95b90c067a54d95a98a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: