Merge "Bluetooth: Remove strings for enabling inband ringing" am: 02a0397643 am: 37f987d7ee
am: 8637bb7e46  -s ours

Change-Id: I8cf5acfb36a041a62b6be1b5af6ef77c9bc3e036