Merge "Fixes a crash ColorScheme#toString" into tm-dev am: 25aff0ec am: 093e9bc6

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



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