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

Change-Id: I3c253b5ee444f23fc81dc607dcc85e95b2aa3226