Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bb08073b6f am: 0115cc702a am: cc7a8d0b2c
am: 763830a0e6

Change-Id: I0f4c10cd00d33f4d2ed42753da2a2edcd66e2d72