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

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

Change-Id: I1986a2bd9096c98378ee4b85a9150d7d0fc27a6f