Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev