Merge "Increase timeout for VtsHalGraphicsComposerV2_4TargetTest" into sc-dev am: b2239ad43f am: b0fefa2d97 am: 4f3e73b022 am: bdc835a32f

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

Change-Id: I9d196e5d45a0d4b4ec60d3806899540ff84f4fb4