Merge "Merge "Prevent updating of seekbar text when not scrubbing." into...

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

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



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