Merge "Switch to using TelephonyConnection#hangup instead of onDisconnect." into sc-dev