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