Merge "Simplify color mode mapping" into tm-dev am: b7715733 am: 01ed4828...

Merge "Simplify color mode mapping" into tm-dev am: b7715733 am: 01ed4828 am: 365a2eb2 am: 3cd50806

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



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