Merge "Clean up code." into tm-dev am: 78d917cc14 am: 9703570e85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987398 Change-Id: I1a78a8bf61f1aea5c17fde51773d276d1157d56f
This commit is contained in: