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

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

Change-Id: I08d4e45b1ee5224e1ab7cdd78afb988f3ac3c04d