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

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



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