Merge "Add a flag that indicates whether in-band ringing is avalable" am: 41f5b61f5d am: 592d78238d
am: 90397ba054

Change-Id: I11c594bb6da104a85a1fd05138e7f224a3d18b09