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

Change-Id: Ic9605f9dd7b36fd51179d35fe372e92710eb381e