Merge "Merge "Removes UniversalSmartspace BroadcastReceiver." into rvc-dev am: 8e11fb50 am: c5efcd53" into rvc-d1-dev-plus-aosp am: cae10a27 am: 1e3cbc4e

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

Change-Id: I371d4b00b523b3046032e469ab9f0847712b0f57