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

Change-Id: I007e1338c447901510c3ca2e2a2c8d0e21de782c