Merge "Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev am: 9ffa8755 am: f7f0bd5f" into oc-mr1-dev-plus-aosp