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