Merge "Merge "Make ISmartspaceManager non-blocking" into tm-dev am: 87451384...

Merge "Merge "Make ISmartspaceManager non-blocking" into tm-dev am: 87451384 am: 09634443" into tm-d1-dev-plus-aosp am: ef3ddf66

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



Change-Id: I626d0c7d7e66ae3d795bf010cd4396c6aa413f4f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>