Merge "Move SkiaCanvas::Clip above SkiaCanvas::SkiaCanvas" am: 770e6897 am:...

Merge "Move SkiaCanvas::Clip above SkiaCanvas::SkiaCanvas" am: 770e6897 am: d80d36a4 am: eda3dacc am: 86a8d4f4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200075



Change-Id: Ia12475aa0035cd2616cf3594d3dfe63a39726452
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>