Merge "Fix crash about Weather class in clocks" into tm-qpr-dev am: 21c4b79734

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

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