Merge "Clean up unused code" into sc-dev am: 3928e0b4f1

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

Change-Id: I3c1d23136d733282b2cbc7215f94d88449fbc852