[automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying...
[automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: bb2144e4 am: 7059c017 -s ours
am skip reason: Change-Id Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b with SHA-1 ed113d54 is in history
Change-Id: I0e495d8cc6bc172bdb248cefd6d812c5918fe1f7