Merge "Increase timeout for VtsHalGraphicsComposerV2_4TargetTest" into sc-dev am: b2239ad43f am: 5f8e6adf93 am: 1ecf9132cc

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15503010

Change-Id: Ia7afdd0bfbe7f9728fb767f99a267598e37f8e04