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: Ie146448d14695a88688a37e5993504d527de9404