[automerger skipped] Merge "Apply max char length when setSingleLine is called." into rvc-qpr-dev am: 23d7aab779 am: 3a3aac9b50 -s ours

am skip reason: Change-Id I1f2fd6c97c5cdeb7be5017d4c6aeb19fd269e939 with SHA-1 459f35ac86 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12122217

Change-Id: Ie71707e519b538ee6276c7a5d6896311fc158fcc