Merge "[automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: bb2144e4 am: 7059c017 -s ours" into rvc-d1-dev-plus-aosp am: 9294475d -s ours am: 873b5542 -s ours

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

Change-Id: I4f50a8630723716f47ab377977daa8712687fc2d