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: I84a8f72bec2d7559e938d16f30716e957018d3c8