am 18510113: resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp

* commit '18510113794df002ee288d8d5fdf8b64b4c957b5':
  Only leave one default network up at a time.
tree: c6c49ccc2fcf459fc756f8044d40b6371c057318
  1. core/
  2. services/