Merge "Set sensor-supplied orientation always to portrait in VrMode." into oc-dev
am: e4e953ae4c

Change-Id: Ifbfc389a5c72493a06de9fa33828ff50ff0d46a5