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

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

Change-Id: Ib2a742a2ef8f4f082427f2b473b3b39d6a0e06c0