[automerger skipped] Merge "KeyStore: Surface RKP failures" am: 6c823256 am:...

[automerger skipped] Merge "KeyStore: Surface RKP failures" am: 6c823256 am: a0e091c6 am: bdea225f -s ours

am skip reason: Merged-In Ief30a3ab97da95b68d172e725c38acbefab92fa9 with SHA-1 fda47fb1 is already in history

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



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