Merge "Update the RKP aidl dependency" into tm-qpr-dev-plus-aosp