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

[automerger skipped] Merge "Ignore failing RecoverableKeyStoreManager tests." am: 3e13eb5a am: d778872f -s ours am: 4238175e -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/+/2584856



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