Merge "Move SkiaCanvas::Clip above SkiaCanvas::SkiaCanvas" am: 770e68977b am: d80d36a428

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

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