tree f10d1460b291093d575b1630b60eb65ec6887392
parent 51e626dcbaf3dd941a39b1ae2901a9277dbd78b8
parent 1ab98f584010de9c1cd9c7076c6ce669312aaba5
author Shawn Willden <swillden@google.com> 1614112871 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614112871 +0000

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