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: Ibf911f9414316c0ba14ae65dd0f581bd0913e2b3