am c7a86e90: am c70348c1: am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev

* commit 'c7a86e90ea5f61e9135e2f9acae0c5c3f37522fc':
  Stop supporting legacy ConnectivityManager routing methods in M.