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: I581aed7e42200d5b78a5e7ac396c76eed883450c