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

Change-Id: I7ffbc1799d9da901fb38db469720479760892bba