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

* commit '8dd79d76cf102ddc681f74109a5541aa6a87e4af':

Change-Id: Iae6e2f1c06b6837836d0d1b9139dc596a0702094