Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f5 am: f42a8893

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816

Change-Id: I66e7ba48d137ec97305081a5c4cbebe25f9d0239