Merge "Default colored notifications use accent color for icon; System...

Merge "Default colored notifications use accent color for icon; System notifications use default color." into sc-dev am: 1b3157fa

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13777687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0dd994fdd44fa11d88ca4d99055364c461003b2