Merge "Update state in NetworkInfo when network resumes" am: a853d2dc37

Change-Id: I26e4b318f7acacde38ee5cf0977fd63fc5567d79