Merge "Merge "Parent notifications should always be normal notification color"...
Merge "Merge "Parent notifications should always be normal notification color" into nyc-dev am: 09ca7e73 am: ece7cd71" into nyc-mr1-dev-plus-aosp
am: a6d5dabd
* commit 'a6d5dabd':
Change-Id: I57ad86e98f00b19e2580f03873a19a83d35e965d