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

Change-Id: I7e1307c5209920326139a60c3aaeb9af6d57d825