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

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

Change-Id: Ic3d9854f2f293b2189f64faee2becc046f52f3b9