Merge "Merge "AOD: Fix wakeup animation duration" into oc-dev am: 34480d2ce0" into oc-dev-plus-aosp