Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am: 8dc06d90ea am: 871e4670a2
am: b1894abbc5

Change-Id: I458a0fdae874039e0f1d5cd38ed8ad0a1754bba9
tree: a922d3bb437eb7e88412d9fb826b7832b5634007
  1. core/
  2. services/
  3. tests/