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

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

Change-Id: I670f2f59b54578c6b7ebdefb2dbdc972939f7bcc