Merge "Revert "Fix weather clock clipped when swiping in Lockscreen"" into...

Merge "Revert "Fix weather clock clipped when swiping in Lockscreen"" into udc-dev am: 7fa9ecf2 am: 2d1fc8ea

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



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