Merge "Simplify color mode mapping" into tm-dev am: b7715733 am: 2475221c am: de69ba31 am: 0c236de7

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



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