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

Change-Id: Ifcc1e3a5a227e652fdf6786bcbe75ab84028d571