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

* commit '0e6207ef406d1fad389a9831e6c8816b274ad2b5':
  Parent notifications should always be normal notification color

Change-Id: I73542bc4adf5240ec130bac09ef788248f929a9b