Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f am: 889aa2cdda am: 46fd70f5e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176 Change-Id: I8bb4793579c1f411396c44a993e8f14259f4f2fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: