[automerger skipped] Merge "Apply SIMPLE strategy to TextView's description" into tm-qpr-dev am: 720643665a am: 3a9014cce3 -s ours

am skip reason: Merged-In Ic6e09e9c99a2f75505947d1cf79391a81d44ea4a with SHA-1 63a775a214 is already in history

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

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