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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaca0ee5a7d0c640c6cd457900de90fd38b5fc2c0