Merge "Extend tethering enable/disable timeout to 30 seconds" into main am: 9f76411b63

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

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