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 am: e406bb52

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



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