Merge "[automerger skipped] Merge "Make getCredentialManagerPolicy user handle...

Merge "[automerger skipped] Merge "Make getCredentialManagerPolicy user handle aware" into udc-dev am: b545d60e am: b4cb6410 am: 8fa0eac6 -s ours" into udc-qpr-dev-plus-aosp am: d9d87a11 -s ours

am skip reason: Merged-In I167238e9cccb818643bc491ef56d40e042d80035 with SHA-1 0951b28b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24419913



Change-Id: Id649636cb77b9beddf5fde9d8850516405aabbf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>