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

Change-Id: I5bafabdfe40175ee15cd3258f1e0ed536a99f164