Merge "[automerger skipped] Merge "Make getCredentialManagerPolicy user handle aware" into udc-dev am: b545d60ef7 am: b4cb64104e am: 8fa0eac6e6 -s ours" into udc-qpr-dev-plus-aosp