Merge "Fix MCT data transport for the BT HAL" am: a8dce86cd8
am: 346ee4e2c8

Change-Id: I5343ae1cdbfe436a29e20b59ea038334f3ef8afe