[automerger skipped] Merge "Set upper-limit for the single line edit text."...

[automerger skipped] Merge "Set upper-limit for the single line edit text." into rvc-qpr-dev am: 00440b4a am: 675aa8d1 -s ours

am skip reason: Change-Id I32b28dcc8c18386839b5adea5b73c77896036567 with SHA-1 9140d2b2 is in history

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

Change-Id: I87fc45ada3136eed0785b5f133807b8a1e2acd4b