Merge "Keystore 2.0: Use secure clock service."