Merge "Update text color on MainSwitch" into udc-dev am: c6b780a5 am: 46e54925 am: 14330a4b am: e0eb4f7e

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



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