[automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd80 -s ours am: 634a94b8 -s ours

am skip reason: Merged-In Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e with SHA-1 685cacb5 is already in history

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

Change-Id: Ib89e1bcdc67b6da4665db70d4940605106a7ab58