[automerger skipped] Merge "Ensure the getCredentialType cache gets enabled"...

[automerger skipped] Merge "Ensure the getCredentialType cache gets enabled" into udc-qpr-dev am: 1db588d6 am: 31fce3f4 -s ours

am skip reason: Merged-In Ie826bdb163288e5741a33e26209d3175de426bd1 with SHA-1 1ba0f668 is already in history

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



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