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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I803baad009423f74ab6369be8b30b4d0ad5c4ac9