Merge "Replace ConnectivityManager constants to TetheringManager"