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

[automerger skipped] Merge "[DO NOT MERGE] Revert "Reference unreachable netId from INetd"" am: 3c2cd1a3 am: 637d3108 am: ef339664 -s ours am: 2ace2a89 am: f5f59510 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4b64d87e51c1a2e0dd045404a0b5f6960c7a976d