Merge changes from topic "fixTetheringRevert" into main am: 5cd7166523

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

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