Merge "Parent notifications should always be normal notification color" into...
Merge "Parent notifications should always be normal notification color" into nyc-dev am: 09ca7e73 am: 0e6207ef
am: 9982d86a
* commit '9982d86a':
Parent notifications should always be normal notification color
Change-Id: Icdda6486af4cccaacfc48dd30d8b97f0aaffa0a5