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

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

Change-Id: I5f337873d2f0ab8aca31a76b2331d8f9d727a84a