Merge "Fixing the colorization of legacy media notifications" into oc-dev
am: 0b84204185

Change-Id: I3015d7234d1d92712ec91de82d66e3ce23288795