Merge "Switch NFC from HIDL to AIDL" am: f851338396

Original change: https://android-review.googlesource.com/c/device/google/barbet/+/2087164

Change-Id: I7f46780be67edf1a38035fe3c9eed9dc886b504b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>