Merge "[MS68.2] Adapt NetworkPolicyManagerService to use registerUsageCallback" am: bc8328bda4

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

Change-Id: I32b46c02a38f8427589887f44a009d4c654a5c01