[automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c
am: c98f700d79
-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: I192b7f1fb1c783917f6490d9ee9ee768c739e5ae
This commit is contained in: