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

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



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