Merge "Fix null pointer exception of calling NetworkInfo.mState.name()" am: ecc1ceb18c am: ccd7ed5888 am: c560826d4d am: a4b8a0e02d
am: 6f1321a7b6

Change-Id: I7f50e9a73658fefbe9877f9fbf7ec20fdacb7ecf