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

Change-Id: I0680026da45bb1828c70ec051e789b0845176702