Merge "Un-remove legacy ConnectivityManager API." into mnc-dev