Merge "Tighten network ownership" into main am: 08e6b318ca

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

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