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