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

Change-Id: I98e64e6197c5e79e6425f39053981f7bf389a895
tree: 2652d8ff638380d48d1da2db9c372bd08edae754
  1. core/
  2. services/
  3. tests/