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

Change-Id: Id33ff99b21a317daf8f18c0ab3df123bb798b0cb