am be265a2b: (-s ours) am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev

* commit 'be265a2b440a959d8f89775499dfaaea8f6fa8e0':