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

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



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