Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644

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



Change-Id: I0d50d150c413f1fa9e17948e844a1331e85c21c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>