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

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

Change-Id: Ic2741704870657f28be482a0ba4b34424f9f2aa3