Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am: 6134b7529b
am: c1c890d7fa

Change-Id: Ib387e9a44e78c7344b6c3efca01302c4aa77483a