Merge "Cleanup shims usage in Tethering" am: 7949b8c557 am: 9a492016d9 am: 4a393b4ab2 am: 71b24161aa am: 3131c60290

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

Change-Id: Ic2395079e37372926e3e0cc2e3d6043a72311e05