Merge "Simplify color mode mapping" into tm-dev am: b7715733 am: 0c392595

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



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