Merge "Don't trigger TextView relayouts if content doesn't change" into tm-dev...

Merge "Don't trigger TextView relayouts if content doesn't change" into tm-dev am: 187a7d7d am: 06fdbb3b am: 4f86c5b6

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



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