Merge "Fix configuration activity colors for accessibility" into sc-dev am:...

Merge "Fix configuration activity colors for accessibility" into sc-dev am: 71f911e7 am: a2543f2b am: f9c91fbd

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

Change-Id: Ifd21976e45d654a3239f988e7a47ee87d6bcf2f3