am fb4a1850: am 8632c99f: Merge "Add HW_AUTH_TOKEN_VERSION constant"

* commit 'fb4a18508dc92dac91d747496562ecdc910ef4dd':
  Add HW_AUTH_TOKEN_VERSION constant