Merge "Update text color on MainSwitch" into udc-dev am: c6b780a5 am: 407c2e39 am: 6b782346 am: b1057c73

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



Change-Id: Ie4c383e041c0129f3daf653288af62a16f144d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>