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

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



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