[automerger skipped] Merge "Fix the preview section incorrectly ordered of the...

[automerger skipped] Merge "Fix the preview section incorrectly ordered of the display size and text." into tm-qpr-dev am: 240eb5c9 am: 66816bcb -s ours

am skip reason: Merged-In I88c65aa9c3f05281a5c5090c2ca9503327bb580f with SHA-1 4b136204 is already in history

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



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