Merge "Account for vr virtual display" into oreo-cts-dev
am: 3e6bfc1d7f

Change-Id: Ifcc46025021a8f9950ffc1d19333d55ea82cec71