Merge "Fix AttestKeyTest failures in KeyMint VTS" into android12-tests-dev