Merge "Simplify clip inside a layer -- will be applied in restore" into master-skia

https://skia.googlesource.com/skia/+/180aec43451dd951fdaae81a92efc710ba093260

Change-Id: I025462a485fd2527a1c0442047aa1e3142e14906