Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am: e8107cf358
am: b993a3a01d

Change-Id: I41f6ab0a055ad149356287429fa0847e81db473a