Merge "Fix clock scale in picker" into udc-dev am: 5fd2a7ec

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/23214257



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