Merge "Fix weather complication disappearing after timer pause" into udc-dev...

Merge "Fix weather complication disappearing after timer pause" into udc-dev am: ea77c0ef am: 94b1c806 am: 0168f4c0

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



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