[automerger skipped] Refactor updating rules for all apps in...

[automerger skipped] Refactor updating rules for all apps in NetworkPolicyManagerService am: e944af5b am: 9405e437 am: ad319420 -s ours

am skip reason: Change-Id Id31a60ad37c280bfb4f5bacf63aafe9de28c5e62 with SHA-1 daa8905d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c0be8aaa82ee6faa72115a0a92825098fa89dd5