Merge "Align caption touch area with width of caption." into udc-qpr-dev am: a3a8f22a

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



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