Merge "KeyStore: Verbose error reporting" am: 9d805c35d0 am: a8f0e5a77c am: 732aae380e

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

Change-Id: I09544cb6be09dd257848cb1c95577dd5950e4b7d