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

Change-Id: Ie04e2589107d91f5d0904c9cf450041baf311e50