Merge "Update Bluetooth codec related strings"
am: d10fd55a91

Change-Id: Ie28703025f732e33abeac2e7d8121bc93eaa3db9