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

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

Change-Id: Ie569aa5b363835c342d6ab5f22eb2978dfd111a8