Merge "[Media UMO] Show times when scrubbing." into tm-dev am: 208d4e17

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



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