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