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

Change-Id: Ie32eee15d12660e096dd0a738195d846bde6c59f