Merge "Switch NFC from HIDL to AIDL" into tm-qpr-dev