Merge "The UI does not remove the preference" into udc-dev am: 28213422

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199828



Change-Id: I6e3a673682128ed250e4d2daec9b8e39c5ef8cbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>