Merge "Fix CERTIFICATE_* tags vts test failures" am: 20446f0f14 am: 1ab98f5840 am: c4b47bd8c7

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1582263

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id401469c86ff36db38da4f287ed4e6093e7c0dae