[automerger skipped] Switch NFC from HIDL to AIDL am: 9782bbc0ca
am: 9d87df0bb3
am: 63631ae2ea
-s ours
am skip reason: Merged-In Id3f65723c6240bbae6f6cc92e7ee57e07e1f0974 with SHA-1 1f8682bf69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/18219340
Change-Id: If6a1318d979a38dc5732d8a95e49e37e15bbbba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: