Merge "Merge "Fix weather complication disappearing after timer pause" into...

Merge "Merge "Fix weather complication disappearing after timer pause" into udc-dev am: ea77c0ef am: 94b1c806 am: f4a8db83" into udc-qpr-dev-plus-aosp am: f993502d

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



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