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

Change-Id: I88f7ab6afc9bc7f9ada00fb66ba6554b74612597