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

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

Change-Id: Ibbef2974a7b8b8b584fb9f1c29d8b23be43ce796