Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
am: 5fd543ec34

Change-Id: I69c8396f015dc926c135a0284a347c6d6d8ca870