[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972
-s ours am: 13a4331504
-s ours
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I38fa873e56caeb6f28e87f84a27d4b79e8f13a4b
This commit is contained in: