Merge "Scale smartspace with the weather clock" into udc-qpr-dev am: 2b5ddfad

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



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