Merge "Clean up unused code" into sc-dev am: 3928e0b4f1
am: d56cb9842f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689 Change-Id: I9e8d800efa5633f86617116e08fdcdf01e38b30b
This commit is contained in: