Merge "[MS68.1] Register usage callback from NetworkPolicyManagerService" am: 145b571178

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958144

Change-Id: Ic961c0fe82545afc30b51e0c7adc15e7ee3a60ef