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

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



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