[automerger skipped] Merge "Update NetworkInfo public API." am: 9dbdb7a0 am:...

[automerger skipped] Merge "Update NetworkInfo public API." am: 9dbdb7a0 am: ed139f5d -s ours am: cc01f833 -s ours am: cb78d975 -s ours
am skip reason: Change-Id Ic50d9b5c65e8771708620badc3bc242a8ffbb5cc with SHA-1 c4bcf75f is in history

Change-Id: Ibada24b85307c62895c507cb43ea6eab047ec658