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

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

Change-Id: Ia66b6f52ec56610e182f31120e3d4a4d653bd70d