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

Change-Id: I83bb60945c507ffa4e509306f3d2517620f41668