Merge "Revise keymint_tags.h" am: 2528ddcab2

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a03d4caa6a7641ede077511a3cc6da7e55475bd