Merge "Fixed an issue where the media notification wouldn't have contrast" into oc-dev
am: 0ac4b7d108

Change-Id: If9ece630645f4ebd3e1ee9e62ed2490d32e21082