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

Change-Id: I2cb07ff584d6b69bcdec6138558e7481787b2bf1