Merge "Fix android.keystore.cts.KeyAttestationTest" into main