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

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

Change-Id: I70892c76677875b44e518ccbca435cea6f2b3fca