Merge "Fix null pointer exception of calling NetworkInfo.mState.name()"
am: 95d62d8e55

Change-Id: Ic003b658854f9407ed8024771c6219df2b6e3806
tree: 279a96d6e2dbf0ef42585e10dd51b78b82f1fb01
  1. core/
  2. services/
  3. tests/