[automerger skipped] [DO NOT MERGE] Revert "Reference unreachable netId from INetd" am: 4d9020efb5 am: e2431f5328 am: 0f99ee62a1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2d1439da5a0f0b527c424982c442e05354a35814