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

Change-Id: Ib06fa5782299fcada3a27c3b6d3d4d7ac3ef3d31