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