Merge "Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev am: feb69bf5a7 am: 3825027579" into oc-mr1-dev-plus-aosp