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

Change-Id: I74b2606347e9b6e2a2424add4aa74d0db687f6ee