Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"