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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa07d73d6c678bb6e7b5cac7b55e5f7faf59fbfd