Merge "Change TelephonyConnection to use onDisconnect callback from original conn." am: e9954848fc am: 2c28f2882e
am: d86c9a090a

Change-Id: I8883a1b6b5ec9aefb1f0c1a71097a73460d4ac62