Merge "Don't allow channel 0 for transmit apdu channel"
am: 2264269c1b

Change-Id: Ia8fee972d3cdd0edfe71db758e504bc86774c5ce