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

Change-Id: I2042c1d15844e34929286e91283ddb9942faea8f