Merge "Remove unnecessary network policy rules bookkeeping" into main am: f29ce13a

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



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