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

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

Change-Id: I41413133749d0e7f4d81f6f361cacef51844142b