Merge "Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev am: 6efe486397 am: 6a7dc737a5" into oc-mr1-dev-plus-aosp