[automerger skipped] Merge "Don't crash after unsetting char[] in TextView"...

[automerger skipped] Merge "Don't crash after unsetting char[] in TextView" into tm-qpr-dev am: 469768f5 am: cd4d5991 -s ours

am skip reason: Merged-In I35a2a76d58ec1946dace2f615cacf6a6085efdeb with SHA-1 166c7217 is already in history

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



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