Merge "Change testing for CarrierApiTest#transmitApdu"