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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb299a56e9021c33e0029473f091bb120450db15