Merge "Fix overlap between weather clock and smartspace" into udc-qpr-dev am:...

Merge "Fix overlap between weather clock and smartspace" into udc-qpr-dev am: 335ebbcd am: 22437fdf

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



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