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

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



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