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: f4a8db83

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



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