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