Android 13.0.0 release 36
Merge "Switch NFC from HIDL to AIDL" into tm-qpr-dev