Merge "TetherUtil: Use ConnectivityManager for tethering" into nyc-mr1-dev