Merge "Modify native stack calls for in-band ringing" am: f08d9dff19 am: 3de5bc5fe8
am: 0dd6f81579

Change-Id: Ic2f741080aef4bd0dd7e41b4812f112ba6f564f5