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

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



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