Merge "Avoid creating a Network with INetd.LOCAL_NET_ID" am: cf55b1ba5f am: 14b20eb18b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2519918

Change-Id: I094291768930e1840ed54bc802c0ca6c1258d017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>