Merge "Add Bluetooth Codec selection UI to the Developer Options"