Merge "Keystore 2.0 SPI: Make LockSettingsService tolerate the Keystore 2.0 SPI"