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

Change-Id: Ifedac6d1b9de029769333529c972ffb26e429a0b