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

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



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