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

Change-Id: I14d244bc7cc413ff204d37dee6d621af9e0e8e29