Merge "ConnectivityService get INetd directly." am: 4fe5af6ec7
am: a6f0fa204b

Change-Id: Ia6c32320eea3117f7a79a6360b7819c64a88faa5