Merge "fix VtsHalGraphicsComposerV2_2TargetTest timeout failed"