[automerger skipped] Merge "Update NetworkInfo public API." am: a159122013 am: f500dafbdb -s ours
am skip reason: Change-Id Ic50d9b5c65e8771708620badc3bc242a8ffbb5cc with SHA-1 04a2e63ed8 is in history
Change-Id: I7d6cc58a43ced0ee618ebd2dc23537d767db5eee
This commit is contained in: