Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev am: 9ffa87552b
am: 64aa52c135

Change-Id: Ia6f62259e476ea90fee82ccf8e703577593e9d29