Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" am: 5de808c5 am: 8b7ca71f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41a1d4c746b1bc390a6060f526b90580d3f2397a