Merge "Increase timeout for VtsHalGraphicsComposerV2_4TargetTest" into sc-dev am: b2239ad43f am: 5f8e6adf93 am: 69adffc993 am: d0858fa829

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

Change-Id: Ibeea862b11b5b761311678fd4aa1b3eef0fc6d9d