Merge "Modify native stack calls for in-band ringing" into oc-dev am: b2baa5d54a
am: f28caa7c70

Change-Id: I913f601a80756b0ec168c3eac35a7ad5f479dd88