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