Merge "Restart SipService if it crashes" into nyc-dev
am: 34d366a

* commit '34d366a95648c7f59ae3649629b24d2af18a7546':
  Restart SipService if it crashes

Change-Id: I06fd54ad487394efe2943c47f3226c5ac8651d36