Merge "Ensure Netd Service is alive" into nyc-dev
am: d521a6d146

* commit 'd521a6d1467a41ba20744f63dd70a40be0f35be0':
  Ensure Netd Service is alive

Change-Id: I733966cdfbfeae1d5603bcbd175af5f7e3038a78