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

Change-Id: I12a729034e65d94f133cd3f3122064071cc6867e