Merge "Add C++ library for ConnectivityManager"