Merge "Add 'aosp.clipTransitionSupport' definition" into main