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

Merge "Provide gesture and tappable element insets for caption" am: 268eff33 am: 3cd3a859 am: 0c0ed6f1 am: 00c67a25

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



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