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

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

Change-Id: I5ac2e43ee79d95e8cc8898406a414cc02b23a70a