Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev