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