Merge "Fix a flake with mocking." am: 527f040944 am: ec050a37ab

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

Change-Id: I16d6975e7480af31f3380eb5323875cf6256cadd