Merge "Remove system properties that gates virtual displays in VR." into oc-dev
am: c3440d30c1

Change-Id: I93ced3d905ff46a8bb5384f497f3cc004ce3b0ac