Merge "Add null-check for lockscreenSmartspace" into tm-qpr-dev am: 23832440 am: ae1d09e7

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



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