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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If74e20cd29d5aacadf55936f936823900a414f6f