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

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

Change-Id: I7e5dc71e1705a7c205c0fd6a7cb57e75cae5a4fc
tree: c00946145bc965c66f3116b31ffed857338cb4ba
  1. framework/
  2. framework-t/
  3. service-t/
  4. tests/