Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine...

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine seekbar control" into tm-dev am: eda5ea3e

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



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