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

Change-Id: Ic9485d3908cc4cc938b7fb31e4f146d9c01dcedd