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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If43ffc4efff55dbbe0abc2bcdef0b79abcf0d0d4