Merge "Update nfc from hidl to aidl service am: 851a643c9e am: c0d30abe87" into tm-qpr-dev-plus-aosp
This commit is contained in:
851a643c9e am: c0d30abe87" into tm-qpr-dev-plus-aosp