Merge "Merge "Removes UniversalSmartspace BroadcastReceiver." into rvc-dev am:...

Merge "Merge "Removes UniversalSmartspace BroadcastReceiver." into rvc-dev am: 8e11fb50 am: f9c91cf7" into rvc-d1-dev-plus-aosp am: 40ec806f

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

Change-Id: Idc9783819c34c0243eb080ecc2cb17aa5c9d4694