Merge "Tighten network ownership" into main am: 08e6b318 am: 63d0ed53

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



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