Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992

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

Change-Id: I4db07fe42154f484d9918096949427aa8569744d