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

Change-Id: I4e13615ae95c363a3f5d65c08998760da480c110