Merge "Remove the usage of NETID_UNSET from Vpn.java"