[automerger skipped] Merge "Update the text wrapping API." into tm-dev am: e8acb4a6 -s ours

am skip reason: Merged-In I93bcb6ebc35344e34e9bb8a24df375aa7b3a8d81 with SHA-1 e5aad7a7 is already in history

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

Change-Id: Ia8609fed7da23e7fa30087dc5a067619a9f71852