Merge "Merge "Prevent updating of seekbar text when not scrubbing." into tm-dev am: b4a4c3b3 am: 151fb0eb" into tm-d1-dev-plus-aosp am: 10a00481 am: 1f91e106

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



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