Merge "Rotate only VR secondary display" into oc-dr1-dev
am: 425784eef2

Change-Id: I2a5acd51bd9ea588823844cd6a49716181e717a9