Merge "Keystore 2.0 SPI: Small fix to apease CTS test."