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