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

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

Change-Id: I1662004b925d40bd84851ddef1d63654307e7862