[automerger skipped] Merge "Switch NFC from HIDL to AIDL am: 9782bbc0ca
am: cdf50082f3" into tm-qpr-dev-plus-aosp am: 5e4aacdf9c
-s ours
am skip reason: Merged-In Id3f65723c6240bbae6f6cc92e7ee57e07e1f0974 with SHA-1 9782bbc0ca
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/18219340
Change-Id: I3fe7b0f6f87b8058ad19690c77fa1c6069b900c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: