Fix Disconnect/re-connect from notification when both VPN and AppTP are enabled

[aitorvs]

Task/Issue URL: https://app.asana.com/0/488551667048375/1208536273997127/f

Description

Fix bug when both AppTP and VPN are enabled and user disconnects from the notification.
When that happens two notifications are showed with CTAs to re-enable AppTP and VPN resp.
Expected:

• AppTP enable enables just ApptP
• VPN enable just enables VPN

Actual

• either ApptP or VPN enable enable both

Steps to test this PR

Test Fix

• Enable both AppTP and VPN
• In the combined AppTP/VPN notification press Disconnect
• Verify two notifications, for AppTP and VPN are shown
• Click on AppTP notification, enable CTA
• verify only AppTP is enabled
• Click on VPN notification, enable CTA
• verify only VPN is enabled
• repeat this test in the inverse order, before VPN then AppTP

Test combined notification

• After doing Test Fix above
• open apps with trackers
• verify AppTP blocks trackers and combined notification works as expected
• smoke test

Test AppTP

• smoke test AppTP only

Test VPN

• smoke test VPN only

[aitorvs]

• Fix Disconnect/re-connect from notification when both VPN and AppTP are enabled #5154 👈
• develop

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @aitorvs and the rest of your teammates on Graphite

[karlenDimla]

@aitorvs when testing this PR I encountered this issue:

• After repeating the test steps in Text fix, at some point I get to a state where after clicking on Disconnect, the combined enabled notif doesn’t disappear (x) , VPN is disabled (ok), VPN and AppTP disabled notifs are shown (ok) BUT nothing on the actions work or do anything (x).

[karlenDimla]

NIt: Can be removed as they are not used anymore in this class right?

[karlenDimla]

Tested and worked as expected. One NIT which will be good to remove before merging