[automerger skipped] Merge "Use metered firewalls for metered uid policy" into...

[automerger skipped] Merge "Use metered firewalls for metered uid policy" into main am: a19281e0 am: 4fe212f6 -s ours

am skip reason: Merged-In I8da11ff663257d3dafcb5e22ae3313a9255ef0a6 with SHA-1 05929f52 is already in history

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



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