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

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

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