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

Change-Id: Ic3ce0b6dca9bf5f31ffc9063df30244f4a13cf3e