[automerger skipped] Merge "Test tethered callback with TetheringInterface" am: c4d26414f8 am: f5590e79e3 -s ours

am skip reason: Merged-In I2a0b8c43fb340c3eaed7f0f90464199222a24280 with SHA-1 82f99f95b7 is already in history

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

Change-Id: I28503e9bec154854b69e7c15c2e23a8782e50ac5