Merge "Test that VpnManager events will never be sent to Settings VPNs" into tm-dev