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

Change-Id: I47b79c0113f3452df40325df4d96952aa1c7d835