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