[automerger skipped] Merge "Fix weather complication disappearing after timer...

[automerger skipped] Merge "Fix weather complication disappearing after timer pause" into tm-qpr-dev am: 35e871c9 -s ours am: 28cb7219 -s ours am: 3263c3a9 -s ours

am skip reason: Merged-In Ide3143558c906ab650e6a295e805adae81eff9bb with SHA-1 f043791d is already in history

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



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