Merge "Expose constants of ConnectivityManager" into sc-dev