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

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

Change-Id: I4c8d8855c920da97474333db85e65a1007fc05e7