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

Change-Id: I98e64e6197c5e79e6425f39053981f7bf389a895