Merge "Check for null text location when applying scaling changes" into tm-dev am: 5d9e19b6 am: 840bf0ab

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

Change-Id: I7c724ae571c8b38db76a70b45120bea64bf0f7d6