Merge \"Remove old reference to SipCallServiceProvider\" into nyc-mr1-dev
am: 0f922456b2

Change-Id: I4941b3d22c5548e3244e33fe1e218bfd24b17848