Merge "Make getCredentialManagerPolicy user handle aware" into udc-dev