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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8e2727c0cf29c8aec830aee0140ed6f14dec46c