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

Change-Id: I437715b23499e6eba5e5653fdc74c37e26f74f2c