Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev am: feb69bf5 am: 7835aad0 am: 77d12993 Change-Id: Ie7266376fd48357fbbcf0492c6a91baf3bae484e