Merge "Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am: e8107cf358 am: b993a3a01d" into oc-mr1-dev-plus-aosp
am: 41ef097af3

Change-Id: I2b7946250c6e61ad8dc0f8a4dafa3a3361be2c9a