Merge "Provide gesture and tappable element insets for caption" am: 268eff33ec am: 3cd3a85988 am: 0c0ed6f1c1

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

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