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

Change-Id: Idfa9c2df46ec69844a7862f0afd8eb1f220463fe