Merge "Remove redundant methods and refactor" into udc-qpr-dev am: 55774422

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



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