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

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

Change-Id: Ie0aebc0ef94af81e1efba767be8e50d368fbbcc4