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

Change-Id: Ic21bfaafead58f0c3ce7f0d206de235890636039