Merge "Increase timeout for VtsHalGraphicsComposerV2_4TargetTest" into sc-dev