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

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

Change-Id: I5b1fc23ad5dc36af7cdc39d07ada95fd099412bc