Merge "Flag guard network change using aconfig flags." into main am: 9022d05dae am: 5bc8c7db9a

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

Change-Id: I4fd18dca7365cf861fc4b3a765b878cf16102334
Signed-off-by: Automerger Merge Worker <[email protected]>