am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev

* commit '4e9ea5e9aef8e35eaa5a876e726544277c80dec5':
  Rename EXTRA_NETWORK ConnectivityManager constants.