[automerger skipped] Merge "[DO NOT MERGE] Revert "Reference unreachable netId from INetd"" am: 3feeafcb4a am: b7130a2c65 am: d348117f40 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I981f62347bf962ce71eeec2e2bdb7b2c25480a30
tree: 0a9da2b0464f55e417cedeb4ce04aedbd97c2e7d
  1. framework/
  2. service/
  3. test/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING