[automerger skipped] [DO NOT MERGE] Revert "Reference unreachable netId from INetd" am: 4d9020ef am: e2431f53 am: 0f99ee62 -s ours am: 75ddfb13

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

Change-Id: Ib914c5d1e3f5ee02c1a8b04a71ddefd1665ef660