Merge "Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d am: a4924eb8 am: 3a2171f6 am: e813a207 am: 1554a00a am: 393f58bf am: 3f89dfc9 am: bfc5e7dd am: e6464391 am: eb40325e" into tm-qpr-dev-plus-aosp am: 8d3fb4aa

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



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