Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c4

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



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