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

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

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

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