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: 92adaf6e am: 8749db2c

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



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