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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4cc44106251d320f416c27e50b510eb9f34c75ba