Merge "Keymint: Add CERTIFICATE_* tags" am: ead6cd16d8 am: 864b71f5ff

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566355

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I136bacafb14b28ed54e9f8f1cc6148ee7fb67aeb