Merge "fix VtsHalGraphicsComposerV2_2TargetTest timeout failed" into android12-tests-dev