Merge "Parent notifications should always be normal notification color" into nyc-dev
am: 09ca7e73c0

* commit '09ca7e73c0e3384a57e4e4fc7c25fd52ca540d98':
  Parent notifications should always be normal notification color

Change-Id: I81160e649188e21d4c763abd8d222fa83608322d