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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d512712c7336806b8ceb183b287c9d757e6e040