Merge "Unregister the tethering internal callback in finalize" am: f8d1f3d1cd am: c472eed19a am: e92e0a4e9a

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

Change-Id: I097d9f5702f3898d809730674497f84fca817906