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

Change-Id: Iebf7d0420a0c3dc48eab637c58e430816e5bbac4