Merge "Remove android.security.KeyStore#getInstance()" into main