Merge "Expose some APIs from ConnectivityManager" into sc-dev