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

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



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