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

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

Change-Id: Idff6b839a222b791a5f21681f4e26ae89a356c1e