Merge "[Output Switcher] change color lint api" into udc-dev am: 0897de80

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



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