Merge "Merge "Removes UniversalSmartspace BroadcastReceiver." into rvc-dev am: 8e11fb50 am: f9c91cf7 am: 1f57cd8e" into rvc-qpr-dev-plus-aosp