[automerger skipped] Merge "Reference unreachable netId from INetd" am: db64a7da1d am: 2543a4d376 am: 814c1d3f44 -s ours

am skip reason: skipped by user cken

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

Change-Id: I0e16151c72075f90790ffea71c02cbf0bc5c4690