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

Change-Id: Id7eb0250f332050b13adf519f3ed5827b79e5f24