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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c5831a893cae5ebe79545912c8c0ab6e983e1ce