Merge "[automerger skipped] Merge "Make getCredentialManagerPolicy user handle aware" into udc-dev am: b545d60ef7 am: 4ed2591d47 -s ours am: c872e0de95 -s ours" into udc-qpr-dev-plus-aosp