Merge "Fix tethering WTF issue" am: e522b7ff75

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

Change-Id: I3561eafd1b517cf5358fb9a627433dfb2854aa26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>