Merge "Fix android.keystore.cts.KeyAttestationTest" into main am: 111900fbc6

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843680

Change-Id: Id2497d12d94a7f49178ac45b2b66696535304ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>