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

Change-Id: Iaae94ae22c4d11648f410ccd7f307ddca84967ce