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

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

Change-Id: Ic7ab67dcad8c16d1e84f04b5a30d49145374c6ee