Merge "Allow color mode to be NOT_SET" into tm-qpr-dev am: 6ad1f71c

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



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