[automerger skipped] Merge "Remove the usage of NETID_UNSET from Vpn.java" am:...

[automerger skipped] Merge "Remove the usage of NETID_UNSET from Vpn.java" am: cf1dc9f2 am: e648a78c am: f08c2ce8 -s ours am: 4e5a7bfa -s ours

am skip reason: skip tag Change-Id I69d449705b1dc541287c72af8dc7705dc4733109 with SHA-1 2cc371c7 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653929

Change-Id: Ie073c69cb35cb40d2b6c5dbce07d39aff99f6773