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: 7611a543

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



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