Merge "ConnectivityManager: Address review comments from aosp/1595396"