Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev