Merge "[DO NOT MERGE] Revert "Reference unreachable netId from INetd"" am: 3c2cd1a33c am: 637d31088d

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

Change-Id: I1aeb8e966cc95ea4734a57855507c1b5534b1e1f