Merge "The UI does not remove the preference" into udc-dev am: 2821342259
am: 5c64b78f4d
am: 857464e9d5
am: ddecd863e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199828 Change-Id: I0342dfb66d5e96e5167e7873f90d3b5edd532a33 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: