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

Change-Id: I3214a82b85f85f3ae23ae1cab22ece815020af1e