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: 9b4e8785 am: def0072b

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



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