Merge "Merge "Fix the VR virtual display height" into oc-dr1-dev am: a79a23dba5" into oc-dr1-dev-plus-aosp
am: 79d658b314

Change-Id: I85452b504d37299a6f9e269720e62dc62c6a9653