Merge "Fix some TetheringCoverageTest failure" am: 08b89743de am: bf74c05038 am: 11f7f5d4b7

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

Change-Id: Ifbdf1e2b1a4f74fa4e8bbdad5de62cbd346efe0f