Merge "Fix notification contrast with transparent bg" into oc-dev am: 9b73401191 am: c3c7bdf043
am: 2a5c0237f3

Change-Id: I0aa554b8dda618d2d2ac85071d86c3c800ce1fd0