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