Merge "Restrict VPN Diagnostics callbacks to underlying networks." am: 48a1305d am: 8dbbe457 am: b3aff3e1 Change-Id: I742a0b18ac29eff39d6e2812a17f428b7b8485a5