Merge "Flag guard network change using aconfig flags." into main am: 9022d05d

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



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