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

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

Change-Id: I84e1892270207230f2dfa5bb6725ad395988ef57