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

Change-Id: Idaf64e69087d813cec9d5982ec5f90e059de748c