Merge "Correct colors on forcibly decorated custom notifications" into sc-dev am: 32906bfb am: a5984d70

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

Change-Id: I91949248c921c348085eaa5f9f8e60592eafe74f