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

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