Merge "Update the preview of the conversation message in the "Display size and...

Merge "Update the preview of the conversation message in the "Display size and text" page." into tm-dev am: 93d48862

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



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