Merge "Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f am: 0187514f74" into nyc-mr2-dev-plus-aosp
am: 7ee4542d17

Change-Id: Ibe3c29fa1c483965531694b3d4b8f6a8154e546d