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: ebbf72a4 am: 17fb80c5 am: 501c758f

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



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