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

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

Change-Id: Ibcc2a34126f201751c3c5e1485708e02eaa37822