Merge "Display smartspace in lockscreen preview" into udc-dev am: df3c6d33

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



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