Merge "Remove the usage of NETID_UNSET from Vpn.java" am: 0f114dff28

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

Change-Id: Ic50dee391e123b9e9debb8e77bac1f0499d939f1
tree: c1313062ef6b7dacc955c265a688bd2cff3a5ff5
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING