(base/telephony) Replacement for https://partner-android-review.googlesource.com/#/c/171175/ Change-Id: I16fc37f5c00ed79f2370bc46554fc7a24c52c4cb Conflicts: core/java/android/net/ConnectivityManager.java
(base/telephony) Replacement for https://partner-android-review.googlesource.com/#/c/171175/ Change-Id: I16fc37f5c00ed79f2370bc46554fc7a24c52c4cb Conflicts: core/java/android/net/ConnectivityManager.java