Merge "Fix weather complication disappearing after timer pause" into tm-qpr-dev am: 35e871c96c

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

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