[automerger skipped] Ensure the getCredentialType cache gets enabled am:...

[automerger skipped] Ensure the getCredentialType cache gets enabled am: 1ba0f668 am: 573c008a -s ours am: 146f146f -s ours am: 00901f32 -s ours

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

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



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