[automerger skipped] Merge "KeyStore: Verbose error reporting" am: 9d805c35d0 am: a8f0e5a77c am: 732aae380e am: 0021be9833 -s ours

am skip reason: Merged-In I776d9e9cc01a9dc3542a63000ee0709847760963 with SHA-1 5da05ee3ed is already in history

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

Change-Id: Ib9877805f104bd67670ea2ff97e4501cdea25840