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

Change-Id: Ia1b27f0ca61b03d4123f373a65f97932ce3a7861