[automerger skipped] Merge "Update NetworkInfo public API." am: 9dbdb7a01e am: ed139f5d9f -s ours am: cc01f83307 -s ours
am skip reason: Change-Id Ic50d9b5c65e8771708620badc3bc242a8ffbb5cc with SHA-1 c4bcf75ff7 is in history
Change-Id: I15e70836b6457f9c40613ef382c4d1483507bf0a
This commit is contained in: