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

Change-Id: I243082e8553c97aa3b28d6e3e72e988136d305cc