[automerger skipped] Merge "[DO NOT MERGE] Revert "Reference unreachable netId from INetd"" am: 3c2cd1a33c am: 637d31088d am: ef339664dd -s ours

am skip reason: subject contains skip directive

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

Change-Id: I981f62347bf962ce71eeec2e2bdb7b2c25480a30