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

Change-Id: I30faf783b233d7095a6c9696be38a5cdf29a24ca