am 845ffcea: Merge "hw_auth_token: make timestamp 64 bits"

* commit '845ffceadc0d68ac806ebd6a1811bb43019aefb6':
  hw_auth_token: make timestamp 64 bits

include/hardware/hw_auth_token.h

@@ -42,7 +42,7 @@ typedef struct __attribute__((__packed__)) {
     uint64_t user_id;             // secure user ID, not Android user ID
     uint64_t authenticator_id;    // secure authenticator ID
     uint32_t authenticator_type;  // hw_authenticator_type_t, in network order
-    uint32_t timestamp;           // in network order
+    uint64_t timestamp;           // in network order
     uint8_t hmac[32];
 } hw_auth_token_t;