Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore."