[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 am: 04ec5899 -s ours am: 14db7c7e -s ours

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

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



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