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

Change-Id: Iabd5160cdc09c36d7f565079f9dfd09969529c88