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

Change-Id: Ie9a167aa6310643465238510831eee8cfab34965