Merge "[DU04-4]Appropriate changes to the NetworkPolicyManager API" am: cd9fe9b220 am: 1f3f4b22cf

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2022895

Change-Id: I76b1412e6e6d2f82a92a8fc7f8de16682a548e72