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

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



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