[automerger skipped] Merge "Reference unreachable netId from INetd" am: 64c2bc7165 am: 47e424ca26 am: 3a6663a2ff -s ours

am skip reason: skipped by user cken

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

Change-Id: I0e16151c72075f90790ffea71c02cbf0bc5c4690
tree: 0a9da2b0464f55e417cedeb4ce04aedbd97c2e7d
  1. framework/
  2. service/
  3. test/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING