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

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

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