Merge "Change TelephonyConnection to use onDisconnect callback from original conn."