[automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c -s ours am: 634a94b899 -s ours am: dff1a9b055 -s ours am: 8d538dc90c -s ours
am skip reason: Merged-In Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e with SHA-1 685cacb540 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16476806
Change-Id: Iafb1a5a656091fa568d882e1613f4bfd6e1d093d
This commit is contained in: