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

Change-Id: I051932a98729e91f4e6512c9fa84a7e261b8cd96