Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f
am: 0187514f74

Change-Id: Ida4b1412270b54f6abe5aa75b7f83d2ffaca0669