DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine seekbar control am: 11a776a9

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



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