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

Change-Id: I03f43da0bce9b7661ce8ce7a6c0eaaf45c87c07e