Merge "Fix it will auto switch back to "No data transfer" after selecting "USB...

Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b

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

Change-Id: I84efecbce455f3d0879db85b7a313ae1d0a14367