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

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



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