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