Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API" am: 73c476d79d am: 8c4e592d2e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007132

Change-Id: I289823436cda3561d76f4c1421201315e0b26638