[automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 488c8e4734 -s ours
am skip reason: Change-Id Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b with SHA-1 e385a7a90a is in history
Change-Id: I2a85d7ddc2fc3e6594e19591b589014d65b8b6f7
This commit is contained in: