Merge "Merge "Implement chip clipping without reparenting" into rvc-dev am: bbba16a2c9 am: 97e4ace420" into rvc-d1-dev-plus-aosp am: 64b66cb9b0

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/11961139

Change-Id: I369ef49577c9f4043117dc54cfd08b9276320df4