Merge "Fix issue where self-managed calls play ringtone. " into oc-dev
am: 1bfc5190e6

Change-Id: Ia402197a52b752f15841b12477b27a4eaf0dceb0