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

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

Change-Id: I211f101b921fe854ebe2169a6248fb856e0f54f6