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