Merge "composer: increase timeout for VTS" am: 11cee080d7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e90793975066eef0db2b01ee3cc9de51779f22c