Merge "Fix weather complication disappearing after timer pause" into udc-dev am: ea77c0ef am: 94b1c806 am: 0168f4c0 am: 2e52299a

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



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