Merge "Fix clock scale in picker" into udc-dev am: 7a973036 am: e4e52c9c

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



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