[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict[Output...

[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict[Output Swithcer] Update color" into tm-dev am: be65de9f am: 0e96e2bf -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id72095ea57d318c70b928a7c027238795a883205