Merge "Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am: e8107cf3 am: b993a3a0" into oc-mr1-dev-plus-aosp