[automerger skipped] Merge "Handle error connecting to KeychainService" into udc-qpr-dev am: 64a1987b80 am: 409319a404 -s ours

am skip reason: Merged-In If2f41aea48ac9284ad205debb878d633072431f4 with SHA-1 a93b4fdfbe is already in history

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

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