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

Change-Id: Ic003b658854f9407ed8024771c6219df2b6e3806