Merge "Merge "Fixes wrong id when granting provider access" into rvc-dev am: d3afc9f1 am: b71b7c37 am: 572c5fda" into rvc-qpr-dev-plus-aosp