Merge "Fix weather clock clipped when swiping in Lockscreen" into udc-dev am: 3146826c

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



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