[automerger skipped] Merge "Fix weather complication disappearing after timer pause" into tm-qpr-dev am: 35e871c96c -s ours am: 28cb7219fb -s ours am: 3263c3a94a -s ours
am skip reason: Merged-In Ide3143558c906ab650e6a295e805adae81eff9bb with SHA-1 f043791d74 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>
This commit is contained in: