Merge "Keymint Support: Fix keymint_tags.h" am: 736d935157

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I200b84b3267971ce38e681b2f3de5db1b22d5e3b