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

* commit 'a6d5dabde2485a9285e09389c23c51498db80aaa':

Change-Id: I57ad86e98f00b19e2580f03873a19a83d35e965d