Merge "Fix weather clock clipped when swiping in Lockscreen" into udc-dev am: 3146826c am: 631f9a3f am: 5b34350c am: 12c37e7c

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



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