Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore"