Merge "Ignore output switcher chip for color transitions" into tm-qpr-dev am: 669b8fd6

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



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