Merge "Keystore: Surface service error message" am: af771eb908 am: b3612e019f am: e53fd593b5 am: a2b165989b

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

Change-Id: I0f3d9721af9aa47bf7f7ae6a419d79ec3547210b