Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795
am: ceb3ec60ee
am: 9e85773279
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696 Change-Id: I81fe3e3472a5596ed310255f1abfbb90df4289e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: