Merge "Keymint: Add CERTIFICATE_* tags required for certificate generation." am: 2679ad6f24 am: 51c3645c51

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd705316bcef5ca3e182a4d6e4d2237816641a13