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

Change-Id: I493e5f8f639a0c7e0dccabed00b48e9216b3cc34