Merge "Update state in NetworkInfo when network resumes" am: c27f541f1b am: 03bc93d50d am: 458d8ff0b1

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