Merge "Merge "Implement chip clipping without reparenting" into rvc-dev am: bbba16a2c9 am: 68c0dd4e72 am: 773a993a06" into rvc-qpr-dev-plus-aosp