Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am: b057b2da02
am: 058533ae25

Change-Id: I49b4565644c584a69897f4b642a1b308fe9df0f0