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