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

Change-Id: I016efc215fa8fcf66a814f7cdf25a8ae0cc13e75