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: I3a939bc7856efee8be0b8f23b54ad9cdf8c9327b