Merge "Always run Virtual Display when in a BootsToVR device." into oc-dr1-dev
am: b8a17cde7e

Change-Id: Ic0fe241ee3bea23816baea9523f89e4845626c68