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

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

Change-Id: Ib6f53eec20bb3c0321abbc1f19f03b0ac0cf4e1f