Merge "Fix weather complication disappearing after timer pause" into udc-dev...

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

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



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