Merge "Reconcile timeouts in virtual display tests" am: 8467c28821

Original change: https://android-review.googlesource.com/c/platform/cts/+/1526804

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3ecb1426e76ccf3e284b251c645c8c55f663363