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

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

Change-Id: I830e8f68e523ac154a488ffd46abf4d5d1694790