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

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

Change-Id: I075f89fee0b812fbebc0e43dc638fb3e9bc29f93