Merge "Support clipping in InlineContentView" into rvc-dev am: 449851f8e2 am: f5e93decb5

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

Change-Id: I40c0c8e61ca6119a3fae68cf3a0de72a06a77c13