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: 6ccb993a

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



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