Merge "AOD: Fix janky pulse out animation" into oc-dr1-dev
am: d72954af31

Change-Id: I1466b41088322781ccfa9433023b039e1551b4aa