Merge "Keystore 2.0 SPI: Fix installation of legacy Keystore provider"