Merge "[MS67.2] Modify tests for registerUsageCallback" am: 3f9584bfda am: ba4588b638

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

Change-Id: I1d2d9c601023f17f65a83879bfa2d3d055a307f2