am 33357f54: am 6490257d: Make netd restart when system server hangs on it.

Merge commit '33357f5477a24cb16bd3dd692fe5ca14755ab033'

* commit '33357f5477a24cb16bd3dd692fe5ca14755ab033':
  Make netd restart when system server hangs on it.