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

Change-Id: Ibd8c0920b66899d36058f249904d33fe14ce9504