[automerger skipped] Merge "Revert^2 "felix: Replace NFC app with NFC apex"" into main am: f9a52d87c5
am: 538d828d21
am: ab7f3aaf73
-s ours
am skip reason: Merged-In I958b2a07dbde6f036b3a615fde6e4255c59a0843 with SHA-1 d67ac5d535
is already in history
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2863566
Change-Id: I096926789aaa90cd8db602c869744324a0a67dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
faade17862