Merge "Bluetooth: Remove strings for enabling inband ringing" am: 02a0397643
am: 37f987d7ee

Change-Id: I2d5a62b3eb22bd10c350495726307674107778b4