Merge "Add Bluetooth Codec selection UI to the Developer Options"
am: bb08073b6f

Change-Id: I1586182f52b726a56c92d2ed35e1e6dd6eff237e