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

Change-Id: Ifd8ce512455b1c994eda43466af3102c1ced172a