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

Change-Id: Iabaf9558348ff4be84c9ed1dfad32ea4d2e167d9