Merge "Update state in NetworkInfo when network resumes" am: 9e3dd9a78f

Change-Id: I26e4b318f7acacde38ee5cf0977fd63fc5567d79
tree: 00ac72ef09ae6e1fdcd5e6595da55888a6bbe990
  1. core/
  2. services/
  3. tests/