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

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



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