Merge "Add order to display settings" into 24D1-dev am: 790abeba56

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

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