[automerger skipped] [DO NOT MERGE] Revert "Reference unreachable netId from...

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

am skip reason: subject contains skip directive

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

Change-Id: I78bb571c651080e8c7538a9fc4c245b8c9c75f7d