Merge "Revise keymint_tags.h" am: 2528ddcab2 am: 90ea1579e2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I567a8c63bb6ef77fa3aba54b703736ab4d743bb4