[automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: bb2144e4c9 -s ours am: 89831bde6b -s ours

am skip reason: Change-Id Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b with SHA-1 ed113d5436 is in history

Change-Id: I57e4ada96a1fc0f95f9a90fed17a04753a7ce73f