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

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

Change-Id: I92aa9ee3a147b489235a27d7f37ea4e00582eb33