Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac am: 65721576d8 am: 1da59b0eab am: b0fb8ebc95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844 Change-Id: I5eb5c4df4bfa6fd98b607df89da8155261d7247d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: