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

* commit '9982d86abcaa7102511364ddf6bf36a140041709':
  Parent notifications should always be normal notification color

Change-Id: Icdda6486af4cccaacfc48dd30d8b97f0aaffa0a5