Merge "Keystore 2.0 SPI: Fix various CTS failures."