Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API" am: 73c476d79d

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

Change-Id: I95ac7442751dca1f4e469edbe950b38aca6c720a