[automerger skipped] Merge "Fix kotlin nullable errors in CredentialManager"...

[automerger skipped] Merge "Fix kotlin nullable errors in CredentialManager" into aosp-main-future am: 035c5308 -s ours am: 623be686 -s ours am: 42ac849d -s ours

am skip reason: Merged-In I9d45c775f6687a30e6e85e9ec3d9fc1944a2dd83 with SHA-1 ea28a7bf is already in history

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



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