Merge "Kill ConnectivityManager.CONNECTIVITY_ACTION_SUPL" into rvc-dev