Merge "AOD: Do not change wakeup animation during DozeService teardown" into...
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am: e8107cf3 am: 53980512
am: b8fb0f9d
Change-Id: Ib06fa5782299fcada3a27c3b6d3d4d7ac3ef3d31