Merge "Fix configuration activity colors for accessibility" into sc-dev am: 71f911e7 am: d79f3cf0 am: 553e95a2

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

Change-Id: I43f9535984838bd8912c81d9cf4f36c23af4d1c7