Merge "AOD: Do not animate notification icons while dozing" into oc-dr1-dev am: 1a16b17ed1
am: f49509726c

Change-Id: I64739cb5eba579af0801b2754e3ee17dae2938a3