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