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

Change-Id: I0cc5f64f292a56e6301b294974c1bd3cc72664c0