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