Merge \"Notification icons: Correctly apply color filter for DrawableContainers\" into nyc-mr1-dev
am: db56fb36a6

Change-Id: Ic66714c31c3328b4560a093082e0bdee553be497