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

[automerger skipped] DO NOT MERGE: Downbranch merge conflict[Output Swithcer] Update color am: 2460ef43 am: 4b6d7d71 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idf99076d15e383553f7ef722d32f1b4450e30fcb