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

Change-Id: I921b33e74287d7d629ff07f5afbd1909d5a785b1