Merge "Revert "Add auth token parsing to IKeymasterDevice.hal""