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: 6ccb993a am: d00a7cf0 am: f3351f63

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



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