[automerger skipped] Merge "Change default USB configuration to a...

[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae989 -s ours am: 13a43315 -s ours am: 88f2a7d4 -s ours

am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99d is already in history

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

Change-Id: I173a3bcaa8ef5fe5a854a47bdeeb2282a7f833c9