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

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



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