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

Change-Id: I6064c83876d18d763cfb0846f8eb19dd32a90576