Merge "When showing a single text line in preview, strip out newlines" into udc-dev am: f5c207adda

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/22907818

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