Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API" am: c48d90e91b am: acb77010ac

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

Change-Id: I289823436cda3561d76f4c1421201315e0b26638