Merge "Fix crash when handling touch on caption" into tm-qpr-dev am: d41f29df

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



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