[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: 734d9495 -s ours am: 5db7b3b2 -s ours am: 37279f38 -s ours am: b166e754 -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: I392bb2e62669ae15e77ec6e6e6b3829bf40c3c2d