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: I63e3b65e6b99705379d459040ebc22dcc8ca9b9f