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

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

Change-Id: I580341450056d53867e7584a3dceb0b70c8e3cb6