Merge "Fix the preview section incorrectly ordered of the display size and...

Merge "Fix the preview section incorrectly ordered of the display size and text." into tm-qpr-dev am: 240eb5c9

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



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