Telephony : Add TRANSPORT_TYPE_COUNT_COLUMN column

Change-Id: I2ed25d2e55f114e87406be29d03eb58925b74b9e
telephony: pick correct APN for MSim

The subId should be sent to TelephonyProvider to pick the correct
preferred APN. Without it, the first APN will simply gets used.

For non-MSim, sending subId shouldn't break anything (Settings send
it anyway)

Change-Id: I837e33391b39bf9bc0b7af06840bfe899c6ffcb7
Merge branch 'remote' into mkl