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

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



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