Merge "[RESTRICT AUTOMERGE] Fix unintended change in KeyAttestationTest" into android11-tests-dev