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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16abe0898e61470f9330d276bb77ca75b743ad82