Merge "Merge "Support clipping in InlineContentView" into rvc-dev am: 449851f8 am: ff0750a8" into rvc-d1-dev-plus-aosp am: 4361f478

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

Change-Id: I4b6bc407470dd870a64d2b450eaf9ed49e818206