Merge "Fix atest VtsAidlKeyMintTargetTest"