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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7367906d87ad83713c3500a613d74ee1e1da401