[automerger skipped] Merge "Only display single line for title" into...

[automerger skipped] Merge "Only display single line for title" into rvc-qpr-dev am: 9258e9ee am: d86780dd -s ours

am skip reason: skip tag Change-Id I98d9a93bfdc792017124dda52a59d25a6462079e with SHA-1 4f6caf29 is already in history

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

Change-Id: I01afabba8497720fed7ef9b1eb726d917db4cd6a