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

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

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