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

Change-Id: Ieafda5fcbaa1252f34e06345f6f2bc0a509e4d68