Merge "Keymint Support: Fix keymint_tags.h" am: 736d935157 am: 3686d22043 am: 8c49bc611e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27fbdcc6dcf21681f01f5be11677a83bd9470225