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

Change-Id: Ide9bc1a3b8dae01db77b1faf3c2a05b7f3548aec