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 am: 4646540a

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



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