Merge "Fix TetheringManager memory leak" am: d7d41a73e7 am: 059afb99bb

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

Change-Id: I503f59fdc989ed93eb0e0b944492bfdb3bf0a7bd