The change fixes VtsHalKeymasterV4_1TargetTest vts failure for DeviceUniqueAttestationTest#NonStrongBoxOnly with default keymaster instance. am: 4f7f0890f7 am: 77223efe7a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f299a51ada9ac5e1061208c10c0137d28abf30e