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

Change-Id: Icac23cee9b3efb082061d19858b248bfdd860bd2