Merge "fix scale settings seekbar to match actual scale" into udc-qpr-dev am:...

Merge "fix scale settings seekbar to match actual scale" into udc-qpr-dev am: c3c42bcc am: 379ed90d

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



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