Merge "KeyStore: Surface RKP failures" am: 6c82325675 am: a0e091c6f3

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

Change-Id: I466711a2d3e8690dc0383140049bed75fa5bb31f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>