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

Change-Id: I9e73507cf6964a7d6747eb1bdea9eb6e8a547d6a