Merge "Add IntDef to BluetoothAdapter IO_CAP constants" am: c1fd61b302
am: 84384d5980

Change-Id: I1cebcaec37e2bc5efcffa4035f83b0cac068630a