Merge "Update format of UEID claim." am: 0058088a1c am: c26a5c44eb

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1525818

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c86262ab6cee0bc9f70a1b3f06ffdfaad0ac1ba