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

Change-Id: I6cb65e11c3a84f9555fd72d2d6709b3a26d7deec