Merge "Revert^4 "Enable smartspace"" into sc-dev am: cb382990cf

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

Change-Id: If6bbf167180c9a6ed38a975fd0f0d160b50d240c