Merge "[DO NOT MERGE] Revert "Reference unreachable netId from INetd"" am: 3feeafcb4a am: b7130a2c65

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

Change-Id: I1aeb8e966cc95ea4734a57855507c1b5534b1e1f
tree: b4ace8274f73ba70f8beddedd38fa21f6f2734f1
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING