Merge "Fix null pointer exception of calling NetworkInfo.mState.name()" am: 10f66f7af5 am: ff68da8ed9
am: c560826d4d

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