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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I955a5b8cd8a63f32ec0bbfaf3a6cbda020a507ee