[automerger skipped] Merge "Remove unnecessary network policy rules...

[automerger skipped] Merge "Remove unnecessary network policy rules bookkeeping" into main am: f29ce13a am: d48c6579 -s ours

am skip reason: Merged-In I075af2696090387aefd1194e6e9d5a07a7d70299 with SHA-1 f4f8319f is already in history

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



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