[automerger skipped] Merge "Remove TextWrapping automation" into udc-qpr-dev...

[automerger skipped] Merge "Remove TextWrapping automation" into udc-qpr-dev am: 45ce6349 am: 6afa3f10 -s ours

am skip reason: Merged-In I35bdfee6cf69b1b519b5f3d06d3cd6d41c324684 with SHA-1 b6be458e is already in history

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



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