[automerger skipped] Merge "Disallow modifying USB in Settings" into sc-dev am: c0c3bce16e
-s ours
am skip reason: Change-Id I3e8461ac37f406a407c874598335cde28fb89b2d with SHA-1 5903962d23
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13580608
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I245f96fb39cf71a0fb8e239d6fe7202224cec596
This commit is contained in: