Merge "Keystore 2.0 SPI: Use Timestamp from secure clock service"