Merge "[MS68.1] Register usage callback from NetworkPolicyManagerService" am: 145b571178 am: a1472b9ba1 am: 87b83e23a3 am: 6c0e0fd8b5

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

Change-Id: I88866a6211c5105d23123757d505011dcab29d3d