Merge "Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255 am: ebc05a6a42" into oc-mr1-dev-plus-aosp
am: 5c179e8edb

Change-Id: I0098636d5346993396d3c05c61525076e0fa5279