Merge "Remove duplicate code" into tm-qpr-dev am: 041d00af am: 65721576 am: 1da59b0e

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



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