Merge "Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry."