Merge "Fix initialization of snapshot SkImage instance" into sc-qpr1-dev am: be0bdf61 am: 15d37532

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

Change-Id: I97799873785f4480427a25dec70b94f0eb270dca