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

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

Change-Id: I4a7ac07e48f726fa090d92d9d5e2d4bec63c1f17