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

Merge "Fix weather clock clipped when swiping in Lockscreen" into udc-dev am: 3146826c am: 1a566d3e am: 43d826bf am: ec2642d9

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



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