Merge "Keystore 2.0: Add CREATE_DATETIME unconditionally."