Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac

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

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