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

Change-Id: I0b2fb8fec05603b7028628dbad3fcf4ddb656851