Merge "Squiggle progress smoothly transitions when seek is disabled" into...

Merge "Squiggle progress smoothly transitions when seek is disabled" into tm-dev am: 22c046e1 am: a08d1a0a

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



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