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

Change-Id: Iad0f7b3ff9db9128e825b72040cc4c9123dde4c1