Merge "Update NetworkInfo public API." am: 9dbdb7a01e

Change-Id: I6658d79bd9bda22ed6b8acac90ba94c9ef18c488