[automerger skipped] Merge "Ignore failing RecoverableKeyStoreManager tests...

[automerger skipped] Merge "Ignore failing RecoverableKeyStoreManager tests part 2." am: 843e9d60 am: 96a4e04f -s ours am: c2d398da -s ours am: 3dc83bd4 -s ours

am skip reason: Merged-In I9f07182ec92f023ee74d90e861452b6906e6a1b1 with SHA-1 ca24397a is already in history

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



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