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

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

Change-Id: I892a135195c4db2253ff2f287dc3013abce9629a