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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58cbb12570459ff19c192cd33647b43333633d1e