Merge "Provide gesture and tappable element insets for caption" am: 268eff33

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



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