Merge "Fix default clock moving up in picker preview" into udc-dev am: e52cc3b0

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



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