Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" am: 80c0656ca6 am: e34375b88c
am: dc9b879ef9  -s ours

Change-Id: I7faaf5fb7e1647e13e0c9539c4bfd9580497c9f5