Merge "Kill ConnectivityManager.CONNECTIVITY_ACTION_SUPL"