Merge "add clipShader API to android.graphics.Canvas" into main