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

Change-Id: I720e1cb9217efcfa3cbfe97a3cfe91c9c2d3f688