Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev