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