[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972
-s ours am: 734d949527
-s ours am: 5db7b3b25f
-s ours am: 37279f38c0
-s ours am: b166e75474
-s ours am: 7ad1dd1626
-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: Id1e050bff7208dd035e2aa77e4e183a3ef12c556
This commit is contained in: