Merge "Skip sending VpnManager events for Settings VPNs" into tm-dev