Merge "Ignore tests in RecoverableKeyStoreManagerTest" am: 197653158e

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

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