Ensure the getCredentialType cache gets enabled am: 1ba0f6685d

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

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