Merge "ConnectivityManager: improve argument validation"
am: cdfd3a186f

Change-Id: I3adb40fe1bd1779d745bb122da06e33068ce48a3