Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: bb2144e4c9 am: 7059c017c3 am: d2a7c216c5

Change-Id: I38dce2e4ee1b5b579e697e6175ab5c97ef65a40c