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: def0072b am: 817bf176

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



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