Merge changes from topic "tetherlocalagent" into main am: 0b7d710ba0

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

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