Merge "Cleanup shims usage in Tethering" am: 7949b8c557 am: 9a492016d9 am: c6ef95ec35

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

Change-Id: Id68e5c905c9d862c2a300a78dce53f10fcb816ef