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

[automerger skipped] Ensure the getCredentialType cache gets enabled am: 1ba0f668 am: f50b4a8c am: de889315 -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/+/24102276



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