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

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

Change-Id: If09620589c4f04b643ccdcd3d70922a347ab6d0c